Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 31 Jan 2011 22:11:23 +0000 (14:11 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 31 Jan 2011 22:11:23 +0000 (14:11 -0800)
commit002b11319bec4c5cb93f5a7d2c0fdbc6e62e7c3a
treea603b2b817decc5d3184100d7c2e592fff6bbe3b
parent384c8efec1d1da0937177fb391b5c2c97fe8704a
parent448e06da9fcc39215a2d4e50bef1e4680ce6345f
Merge from mainline.